(dired-get-filename): Don't call encode-coding-string

if file-name-coding-system is non-nil.

diff --git a/lisp/dired.el b/lisp/dired.el
index 118c4c8bdee6c42bfda323606cb92cc550100c3c..29d397ca56ab2806d3db0a1b140e1b60b063cc50 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1300,6 +1300,7 @@ Optional arg NO-ERROR-IF-NOT-FILEP means return nil if no filename on
                             file)
                         "\"")))))
     (and file buffer-file-coding-system
+        (not file-name-coding-system)
         (setq file (encode-coding-string file buffer-file-coding-system)))
     (if (eq localp 'no-dir)
        file